From: Juri Linkov <juri@jurta.org>
Date: Sat, 3 Jul 2004 05:18:38 +0000 (+0000)
Subject: (query-replace-read-args): Swallow space after 'foo,
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~21748
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=20145842656e0ee01d705404b632bb1d377a7bb4;p=emacs.git

(query-replace-read-args): Swallow space after 'foo,
not after (quote foo).  Match space only immediately after symbol,
not anywhere in the whole string.
---

diff --git a/lisp/replace.el b/lisp/replace.el
index 8e8b43d66c6..4c381c658e5 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -125,8 +125,9 @@ strings or patterns."
 					 ;; Swallow a space after 'foo
 					 ;; but not after (quote foo).
 					 (and (eq (car-safe (car pos)) 'quote)
-					      (= ?\( (aref to 0))))
-				     (string-match " " to (cdr pos)))
+					      (not (= ?\( (aref to 0)))))
+				     (eq (string-match " " to (cdr pos))
+					 (cdr pos)))
 				(1+ (cdr pos))
 			      (cdr pos))))
 		       (setq to (substring to end)))))
@@ -212,7 +213,7 @@ In interactive calls, the replacement text can contain `\\,'
 followed by a Lisp expression.  Each
 replacement evaluates that expression to compute the replacement
 string.  Inside of that expression, `\\&' is a string denoting the
-whole match as a sting, `\\N' for a partial match, `\\#&' and `\\#N'
+whole match as a string, `\\N' for a partial match, `\\#&' and `\\#N'
 for the whole or a partial match converted to a number with
 `string-to-number', and `\\#' itself for the number of replacements
 done so far (starting with zero).